From f479a13f284ab22e3ee1c1d4d8912cfda6b3ca6a Mon Sep 17 00:00:00 2001 From: "sos22@douglas.cl.cam.ac.uk" Date: Thu, 10 Feb 2005 18:05:33 +0000 Subject: [PATCH] bitkeeper revision 1.1173 (420ba26dU4VauWP5oFVWCo3QsMg0Jw) Make everything compile again. Signed-off-by: sos22@cl.cam.ac.uk. --- xen/Rules.mk | 4 ---- xen/arch/x86/Makefile | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index f8def0ec88..4d594dd3d0 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -1,7 +1,6 @@ verbose ?= n debug ?= n -debugger ?= n perfc ?= n trace ?= n optimize ?= y @@ -57,9 +56,6 @@ endif ifeq ($(crash_debug),y) CFLAGS += -g -DCRASH_DEBUG -ifeq ($(debugger),y) -error Crash debugger conflicts with PDB -endif endif ifeq ($(perfc),y) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index d0750ac400..c44d96fe9a 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -12,7 +12,8 @@ OBJS := $(patsubst vmx%.o,,$(OBJS)) endif ifneq ($(crash_debug),y) -OBJS := $(subst cdb%.o,,$(OBJS)) +OBJS := $(patsubst cdb%.o,,$(OBJS)) +OBJS := $(patsubst $(TARGET_SUBARCH)/cdb%.o,,$(OBJS)) endif default: $(TARGET) -- 2.30.2